Autogenerated HTML docs for v1.7.3.2-161-g3089c
diff --git a/git-pull.html b/git-pull.html index a6195f5..57c9185 100644 --- a/git-pull.html +++ b/git-pull.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>git-pull(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>git-pull(1)</title> </head> <body> <div id="header"> @@ -318,29 +412,29 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p><em>git pull</em> [options] [<repository> [<refspec>…]]</p></div> +<div class="paragraph"><p><em>git pull</em> [options] [<repository> [<refspec>…]]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Incorporates changes from a remote repository into the current +<div class="paragraph"><p>Incorporates changes from a remote repository into the current branch. In its default mode, <tt>git pull</tt> is shorthand for <tt>git fetch</tt> followed by <tt>git merge FETCH_HEAD</tt>.</p></div> -<div class="para"><p>More precisely, <em>git pull</em> runs <em>git fetch</em> with the given +<div class="paragraph"><p>More precisely, <em>git pull</em> runs <em>git fetch</em> with the given parameters and calls <em>git merge</em> to merge the retrieved branch heads into the current branch. With <tt>--rebase</tt>, it runs <em>git rebase</em> instead of <em>git merge</em>.</p></div> -<div class="para"><p><repository> should be the name of a remote repository as +<div class="paragraph"><p><repository> should be the name of a remote repository as passed to <a href="git-fetch.html">git-fetch(1)</a>. <refspec> can name an arbitrary remote ref (for example, the name of a tag) or even a collection of refs with corresponding remote tracking branches (e.g., refs/heads/<strong>:refs/remotes/origin/</strong>), but usually it is the name of a branch in the remote repository.</p></div> -<div class="para"><p>Default values for <repository> and <branch> are read from the +<div class="paragraph"><p>Default values for <repository> and <branch> are read from the "remote" and "merge" configuration for the current branch as set by <a href="git-branch.html">git-branch(1)</a> <tt>--track</tt>.</p></div> -<div class="para"><p>Assume the following history exists and the current branch is +<div class="paragraph"><p>Assume the following history exists and the current branch is "<tt>master</tt>":</p></div> <div class="listingblock"> <div class="content"> @@ -348,7 +442,7 @@ / D---E---F---G master</tt></pre> </div></div> -<div class="para"><p>Then "<tt>git pull</tt>" will fetch and replay the changes from the remote +<div class="paragraph"><p>Then "<tt>git pull</tt>" will fetch and replay the changes from the remote <tt>master</tt> branch since it diverged from the local <tt>master</tt> (i.e., <tt>E</tt>) until its current commit (<tt>C</tt>) on top of <tt>master</tt> and record the result in a new commit along with the names of the two parent commits @@ -359,26 +453,26 @@ / \ D---E---F---G---H master</tt></pre> </div></div> -<div class="para"><p>See <a href="git-merge.html">git-merge(1)</a> for details, including how conflicts +<div class="paragraph"><p>See <a href="git-merge.html">git-merge(1)</a> for details, including how conflicts are presented and handled.</p></div> -<div class="para"><p>In git 1.7.0 or later, to cancel a conflicting merge, use +<div class="paragraph"><p>In git 1.7.0 or later, to cancel a conflicting merge, use <tt>git reset --merge</tt>. <strong>Warning</strong>: In older versions of git, running <em>git pull</em> with uncommitted changes is discouraged: while possible, it leaves you in a state that may be hard to back out of in the case of a conflict.</p></div> -<div class="para"><p>If any of the remote changes overlap with local uncommitted changes, +<div class="paragraph"><p>If any of the remote changes overlap with local uncommitted changes, the merge will be automatically cancelled and the work tree untouched. It is generally best to get any local changes in working order before pulling or stash them away with <a href="git-stash.html">git-stash(1)</a>.</p></div> </div> <h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<div class="para"><p>Options meant for <em>git pull</em> itself and the underlying <em>git merge</em> +<div class="paragraph"><p>Options meant for <em>git pull</em> itself and the underlying <em>git merge</em> must be given before the options meant for <em>git fetch</em>.</p></div> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> -q </dt> -<dt> +<dt class="hdlist1"> --quiet </dt> <dd> @@ -388,10 +482,10 @@ merging. </p> </dd> -<dt> +<dt class="hdlist1"> -v </dt> -<dt> +<dt class="hdlist1"> --verbose </dt> <dd> @@ -401,11 +495,11 @@ </dd> </dl></div> <h3 id="_options_related_to_merging">Options related to merging</h3><div style="clear:left"></div> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> --commit </dt> -<dt> +<dt class="hdlist1"> --no-commit </dt> <dd> @@ -413,14 +507,14 @@ Perform the merge and commit the result. This option can be used to override --no-commit. </p> -<div class="para"><p>With --no-commit perform the merge but pretend the merge +<div class="paragraph"><p>With --no-commit perform the merge but pretend the merge failed and do not autocommit, to give the user a chance to inspect and further tweak the merge result before committing.</p></div> </dd> -<dt> +<dt class="hdlist1"> --ff </dt> -<dt> +<dt class="hdlist1"> --no-ff </dt> <dd> @@ -429,13 +523,13 @@ a fast-forward, only update the branch pointer. This is the default behavior of git-merge. </p> -<div class="para"><p>With --no-ff Generate a merge commit even if the merge +<div class="paragraph"><p>With --no-ff Generate a merge commit even if the merge resolved as a fast-forward.</p></div> </dd> -<dt> +<dt class="hdlist1"> --log[=<n>] </dt> -<dt> +<dt class="hdlist1"> --no-log </dt> <dd> @@ -444,16 +538,16 @@ one-line descriptions from at most <n> actual commits that are being merged. See also <a href="git-fmt-merge-msg.html">git-fmt-merge-msg(1)</a>. </p> -<div class="para"><p>With --no-log do not list one-line descriptions from the +<div class="paragraph"><p>With --no-log do not list one-line descriptions from the actual commits being merged.</p></div> </dd> -<dt> +<dt class="hdlist1"> --stat </dt> -<dt> +<dt class="hdlist1"> -n </dt> -<dt> +<dt class="hdlist1"> --no-stat </dt> <dd> @@ -461,13 +555,13 @@ Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat. </p> -<div class="para"><p>With -n or --no-stat do not show a diffstat at the end of the +<div class="paragraph"><p>With -n or --no-stat do not show a diffstat at the end of the merge.</p></div> </dd> -<dt> +<dt class="hdlist1"> --squash </dt> -<dt> +<dt class="hdlist1"> --no-squash </dt> <dd> @@ -481,10 +575,10 @@ top of the current branch whose effect is the same as merging another branch (or more in case of an octopus). </p> -<div class="para"><p>With --no-squash perform the merge and commit the result. This +<div class="paragraph"><p>With --no-squash perform the merge and commit the result. This option can be used to override --squash.</p></div> </dd> -<dt> +<dt class="hdlist1"> --ff-only </dt> <dd> @@ -494,10 +588,10 @@ resolved as a fast-forward. </p> </dd> -<dt> +<dt class="hdlist1"> -s <strategy> </dt> -<dt> +<dt class="hdlist1"> --strategy=<strategy> </dt> <dd> @@ -509,10 +603,10 @@ head, <em>git merge-octopus</em> otherwise). </p> </dd> -<dt> +<dt class="hdlist1"> -X <option> </dt> -<dt> +<dt class="hdlist1"> --strategy-option=<option> </dt> <dd> @@ -521,10 +615,10 @@ strategy. </p> </dd> -<dt> +<dt class="hdlist1"> --summary </dt> -<dt> +<dt class="hdlist1"> --no-summary </dt> <dd> @@ -533,10 +627,10 @@ removed in the future. </p> </dd> -<dt> +<dt class="hdlist1"> -q </dt> -<dt> +<dt class="hdlist1"> --quiet </dt> <dd> @@ -544,10 +638,10 @@ Operate quietly. </p> </dd> -<dt> +<dt class="hdlist1"> -v </dt> -<dt> +<dt class="hdlist1"> --verbose </dt> <dd> @@ -556,8 +650,8 @@ </p> </dd> </dl></div> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> --rebase </dt> <dd> @@ -574,14 +668,14 @@ <td class="icon"> <div class="title">Note</div> </td> -<td class="content">This is a potentially _dangerous_ mode of operation. +<td class="content">This is a potentially <em>dangerous</em> mode of operation. It rewrites history, which does not bode well when you published that history already. Do <strong>not</strong> use this option unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</td> </tr></table> </div> </dd> -<dt> +<dt class="hdlist1"> --no-rebase </dt> <dd> @@ -591,8 +685,8 @@ </dd> </dl></div> <h3 id="_options_related_to_fetching">Options related to fetching</h3><div style="clear:left"></div> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> --all </dt> <dd> @@ -600,10 +694,10 @@ Fetch all remotes. </p> </dd> -<dt> +<dt class="hdlist1"> -a </dt> -<dt> +<dt class="hdlist1"> --append </dt> <dd> @@ -613,7 +707,7 @@ option old data in <tt>.git/FETCH_HEAD</tt> will be overwritten. </p> </dd> -<dt> +<dt class="hdlist1"> --depth=<depth> </dt> <dd> @@ -623,10 +717,10 @@ by the specified number of commits. </p> </dd> -<dt> +<dt class="hdlist1"> -f </dt> -<dt> +<dt class="hdlist1"> --force </dt> <dd> @@ -638,10 +732,10 @@ overrides that check. </p> </dd> -<dt> +<dt class="hdlist1"> -k </dt> -<dt> +<dt class="hdlist1"> --keep </dt> <dd> @@ -649,7 +743,7 @@ Keep downloaded pack. </p> </dd> -<dt> +<dt class="hdlist1"> --no-tags </dt> <dd> @@ -661,10 +755,10 @@ setting. See <a href="git-config.html">git-config(1)</a>. </p> </dd> -<dt> +<dt class="hdlist1"> -t </dt> -<dt> +<dt class="hdlist1"> --tags </dt> <dd> @@ -679,10 +773,10 @@ <a href="git-config.html">git-config(1)</a>. </p> </dd> -<dt> +<dt class="hdlist1"> -u </dt> -<dt> +<dt class="hdlist1"> --update-head-ok </dt> <dd> @@ -695,7 +789,7 @@ use it. </p> </dd> -<dt> +<dt class="hdlist1"> --upload-pack <upload-pack> </dt> <dd> @@ -706,7 +800,7 @@ run on the other end. </p> </dd> -<dt> +<dt class="hdlist1"> --progress </dt> <dd> @@ -717,7 +811,7 @@ standard error stream is not directed to a terminal. </p> </dd> -<dt> +<dt class="hdlist1"> <repository> </dt> <dd> @@ -728,7 +822,7 @@ of a remote (see the section <a href="#REMOTES">REMOTES</a> below). </p> </dd> -<dt> +<dt class="hdlist1"> <refspec> </dt> <dd> @@ -737,7 +831,7 @@ <tt>+</tt>, followed by the source ref <src>, followed by a colon <tt>:</tt>, followed by the destination ref <dst>. </p> -<div class="para"><p>The remote ref that matches <src> +<div class="paragraph"><p>The remote ref that matches <src> is fetched, and if <dst> is not empty string, the local ref that matches it is fast-forwarded using <src>. If the optional plus <tt>+</tt> is used, the local ref @@ -799,8 +893,8 @@ is often useful.</td> </tr></table> </div> -<div class="para"><p>Some short-cut notations are also supported.</p></div> -<div class="ilist"><ul> +<div class="paragraph"><p>Some short-cut notations are also supported.</p></div> +<div class="ulist"><ul> <li> <p> <tt>tag <tag></tt> means the same as <tt>refs/tags/<tag>:refs/tags/<tag></tt>; @@ -820,13 +914,13 @@ </div> <h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2> <div class="sectionbody"> -<div class="para"><p>In general, URLs contain information about the transport protocol, the +<div class="paragraph"><p>In general, URLs contain information about the transport protocol, the address of the remote server, and the path to the repository. Depending on the transport protocol, some of this information may be absent.</p></div> -<div class="para"><p>Git natively supports ssh, git, http, https, ftp, ftps, and rsync +<div class="paragraph"><p>Git natively supports ssh, git, http, https, ftp, ftps, and rsync protocols. The following syntaxes may be used with them:</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> ssh://[user@]host.xz[:port]/path/to/repo.git/ @@ -853,16 +947,16 @@ </p> </li> </ul></div> -<div class="para"><p>An alternative scp-like syntax may also be used with the ssh protocol:</p></div> -<div class="ilist"><ul> +<div class="paragraph"><p>An alternative scp-like syntax may also be used with the ssh protocol:</p></div> +<div class="ulist"><ul> <li> <p> [user@]host.xz:path/to/repo.git/ </p> </li> </ul></div> -<div class="para"><p>The ssh and git protocols additionally support ~username expansion:</p></div> -<div class="ilist"><ul> +<div class="paragraph"><p>The ssh and git protocols additionally support ~username expansion:</p></div> +<div class="ulist"><ul> <li> <p> ssh://[user@]host.xz[:port]/~[user]/path/to/repo.git/ @@ -879,9 +973,9 @@ </p> </li> </ul></div> -<div class="para"><p>For local repositories, also supported by git natively, the following +<div class="paragraph"><p>For local repositories, also supported by git natively, the following syntaxes may be used:</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> /path/to/repo.git/ @@ -889,28 +983,28 @@ </li> <li> <p> -file:///path/to/repo.git/ +<a href="file:///path/to/repo.git/">file:///path/to/repo.git/</a> </p> </li> </ul></div> -<div class="para"><p>These two syntaxes are mostly equivalent, except when cloning, when +<div class="paragraph"><p>These two syntaxes are mostly equivalent, except when cloning, when the former implies --local option. See <a href="git-clone.html">git-clone(1)</a> for details.</p></div> -<div class="para"><p>When git doesn't know how to handle a certain transport protocol, it +<div class="paragraph"><p>When git doesn’t know how to handle a certain transport protocol, it attempts to use the <em>remote-<transport></em> remote helper, if one exists. To explicitly request a remote helper, the following syntax may be used:</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> <transport>::<address> </p> </li> </ul></div> -<div class="para"><p>where <address> may be a path, a server and path, or an arbitrary +<div class="paragraph"><p>where <address> may be a path, a server and path, or an arbitrary URL-like string recognized by the specific remote helper being invoked. See <a href="git-remote-helpers.html">git-remote-helpers(1)</a> for details.</p></div> -<div class="para"><p>If there are a large number of similarly-named remote repositories and +<div class="paragraph"><p>If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:</p></div> @@ -919,37 +1013,37 @@ <pre><tt> [url "<actual url base>"] insteadOf = <other url base></tt></pre> </div></div> -<div class="para"><p>For example, with this:</p></div> +<div class="paragraph"><p>For example, with this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> [url "git://git.host.xz/"] insteadOf = host.xz:/path/to/ insteadOf = work:</tt></pre> </div></div> -<div class="para"><p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be +<div class="paragraph"><p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p></div> -<div class="para"><p>If you want to rewrite URLs for push only, you can create a +<div class="paragraph"><p>If you want to rewrite URLs for push only, you can create a configuration section of the form:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> [url "<actual url base>"] pushInsteadOf = <other url base></tt></pre> </div></div> -<div class="para"><p>For example, with this:</p></div> +<div class="paragraph"><p>For example, with this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> [url "ssh://example.org/"] pushInsteadOf = git://example.org/</tt></pre> </div></div> -<div class="para"><p>a URL like "git://example.org/path/to/repo.git" will be rewritten to +<div class="paragraph"><p>a URL like "git://example.org/path/to/repo.git" will be rewritten to "ssh://example.org/path/to/repo.git" for pushes, but pulls will still use the original URL.</p></div> </div> <h2 id="_remotes_a_id_remotes_a">REMOTES<a id="REMOTES"></a></h2> <div class="sectionbody"> -<div class="para"><p>The name of one of the following can be used instead +<div class="paragraph"><p>The name of one of the following can be used instead of a URL as <tt><repository></tt> argument:</p></div> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> a remote in the git configuration file: <tt>$GIT_DIR/config</tt>, @@ -966,10 +1060,10 @@ </p> </li> </ul></div> -<div class="para"><p>All of these also allow you to omit the refspec from the command line +<div class="paragraph"><p>All of these also allow you to omit the refspec from the command line because they each contain a refspec which git will use by default.</p></div> <h3 id="_named_remote_in_configuration_file">Named remote in configuration file</h3><div style="clear:left"></div> -<div class="para"><p>You can choose to provide the name of a remote which you had previously +<div class="paragraph"><p>You can choose to provide the name of a remote which you had previously configured using <a href="git-remote.html">git-remote(1)</a>, <a href="git-config.html">git-config(1)</a> or even by a manual edit to the <tt>$GIT_DIR/config</tt> file. The URL of this remote will be used to access the repository. The refspec @@ -984,10 +1078,10 @@ push = <refspec> fetch = <refspec></tt></pre> </div></div> -<div class="para"><p>The <tt><pushurl></tt> is used for pushes only. It is optional and defaults +<div class="paragraph"><p>The <tt><pushurl></tt> is used for pushes only. It is optional and defaults to <tt><url></tt>.</p></div> <h3 id="_named_file_in_tt_git_dir_remotes_tt">Named file in <tt>$GIT_DIR/remotes</tt></h3><div style="clear:left"></div> -<div class="para"><p>You can choose to provide the name of a +<div class="paragraph"><p>You can choose to provide the name of a file in <tt>$GIT_DIR/remotes</tt>. The URL in this file will be used to access the repository. The refspec in this file will be used as default when you do not @@ -997,15 +1091,14 @@ <div class="content"> <pre><tt> URL: one of the above URL format Push: <refspec> - Pull: <refspec> -</tt></pre> + Pull: <refspec></tt></pre> </div></div> -<div class="para"><p><tt>Push:</tt> lines are used by <em>git push</em> and +<div class="paragraph"><p><tt>Push:</tt> lines are used by <em>git push</em> and <tt>Pull:</tt> lines are used by <em>git pull</em> and <em>git fetch</em>. Multiple <tt>Push:</tt> and <tt>Pull:</tt> lines may be specified for additional branch mappings.</p></div> <h3 id="_named_file_in_tt_git_dir_branches_tt">Named file in <tt>$GIT_DIR/branches</tt></h3><div style="clear:left"></div> -<div class="para"><p>You can choose to provide the name of a +<div class="paragraph"><p>You can choose to provide the name of a file in <tt>$GIT_DIR/branches</tt>. The URL in this file will be used to access the repository. This file should have the following format:</p></div> @@ -1013,17 +1106,17 @@ <div class="content"> <pre><tt> <url>#<head></tt></pre> </div></div> -<div class="para"><p><tt><url></tt> is required; <tt>#<head></tt> is optional.</p></div> -<div class="para"><p>Depending on the operation, git will use one of the following -refspecs, if you don't provide one on the command line. +<div class="paragraph"><p><tt><url></tt> is required; <tt>#<head></tt> is optional.</p></div> +<div class="paragraph"><p>Depending on the operation, git will use one of the following +refspecs, if you don’t provide one on the command line. <tt><branch></tt> is the name of this file in <tt>$GIT_DIR/branches</tt> and <tt><head></tt> defaults to <tt>master</tt>.</p></div> -<div class="para"><p>git fetch uses:</p></div> +<div class="paragraph"><p>git fetch uses:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> refs/heads/<head>:refs/heads/<branch></tt></pre> </div></div> -<div class="para"><p>git push uses:</p></div> +<div class="paragraph"><p>git push uses:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> HEAD:refs/heads/<head></tt></pre> @@ -1031,12 +1124,12 @@ </div> <h2 id="_merge_strategies">MERGE STRATEGIES</h2> <div class="sectionbody"> -<div class="para"><p>The merge mechanism (<em>git-merge</em> and <em>git-pull</em> commands) allows the +<div class="paragraph"><p>The merge mechanism (<em>git-merge</em> and <em>git-pull</em> commands) allows the backend <em>merge strategies</em> to be chosen with <tt>-s</tt> option. Some strategies can also take their own options, which can be passed by giving <tt>-X<option></tt> arguments to <em>git-merge</em> and/or <em>git-pull</em>.</p></div> -<div class="vlist"><dl> -<dt> +<div class="dlist"><dl> +<dt class="hdlist1"> resolve </dt> <dd> @@ -1048,7 +1141,7 @@ fast. </p> </dd> -<dt> +<dt class="hdlist1"> recursive </dt> <dd> @@ -1065,9 +1158,9 @@ renames. This is the default merge strategy when pulling or merging one branch. </p> -<div class="para"><p>The <em>recursive</em> strategy can take the following options:</p></div> -<div class="vlist"><dl> -<dt> +<div class="paragraph"><p>The <em>recursive</em> strategy can take the following options:</p></div> +<div class="dlist"><dl> +<dt class="hdlist1"> ours </dt> <dd> @@ -1076,11 +1169,11 @@ favoring <em>our</em> version. Changes from the other tree that do not conflict with our side are reflected to the merge result. </p> -<div class="para"><p>This should not be confused with the <em>ours</em> merge strategy, which does not +<div class="paragraph"><p>This should not be confused with the <em>ours</em> merge strategy, which does not even look at what the other tree contains at all. It discards everything the other tree did, declaring <em>our</em> history contains all that happened in it.</p></div> </dd> -<dt> +<dt class="hdlist1"> theirs </dt> <dd> @@ -1088,7 +1181,7 @@ This is opposite of <em>ours</em>. </p> </dd> -<dt> +<dt class="hdlist1"> patience </dt> <dd> @@ -1100,13 +1193,13 @@ See also <a href="git-diff.html">git-diff(1)</a> <tt>--patience</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> ignore-space-change </dt> -<dt> +<dt class="hdlist1"> ignore-all-space </dt> -<dt> +<dt class="hdlist1"> ignore-space-at-eol </dt> <dd> @@ -1117,7 +1210,7 @@ See also <a href="git-diff.html">git-diff(1)</a> <tt>-b</tt>, <tt>-w</tt>, and <tt>--ignore-space-at-eol</tt>. </p> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> If <em>their</em> version only introduces whitespace changes to a line, @@ -1137,7 +1230,7 @@ </li> </ul></div> </dd> -<dt> +<dt class="hdlist1"> renormalize </dt> <dd> @@ -1150,7 +1243,7 @@ <a href="gitattributes.html">gitattributes(5)</a> for details. </p> </dd> -<dt> +<dt class="hdlist1"> no-renormalize </dt> <dd> @@ -1159,7 +1252,7 @@ <tt>merge.renormalize</tt> configuration variable. </p> </dd> -<dt> +<dt class="hdlist1"> rename-threshold=<n> </dt> <dd> @@ -1168,7 +1261,7 @@ See also <a href="git-diff.html">git-diff(1)</a> <tt>-M</tt>. </p> </dd> -<dt> +<dt class="hdlist1"> subtree[=<path>] </dt> <dd> @@ -1182,7 +1275,7 @@ </dd> </dl></div> </dd> -<dt> +<dt class="hdlist1"> octopus </dt> <dd> @@ -1194,7 +1287,7 @@ pulling or merging more than one branch. </p> </dd> -<dt> +<dt class="hdlist1"> ours </dt> <dd> @@ -1207,7 +1300,7 @@ the <em>recursive</em> merge strategy. </p> </dd> -<dt> +<dt class="hdlist1"> subtree </dt> <dd> @@ -1223,42 +1316,42 @@ </div> <h2 id="_default_behaviour">DEFAULT BEHAVIOUR</h2> <div class="sectionbody"> -<div class="para"><p>Often people use <tt>git pull</tt> without giving any parameter. +<div class="paragraph"><p>Often people use <tt>git pull</tt> without giving any parameter. Traditionally, this has been equivalent to saying <tt>git pull origin</tt>. However, when configuration <tt>branch.<name>.remote</tt> is present while on branch <tt><name></tt>, that value is used instead of <tt>origin</tt>.</p></div> -<div class="para"><p>In order to determine what URL to use to fetch from, the value +<div class="paragraph"><p>In order to determine what URL to use to fetch from, the value of the configuration <tt>remote.<origin>.url</tt> is consulted -and if there is not any such variable, the value on <tt>URL: </tt> line -in <tt>$GIT_DIR/remotes/<origin></tt> file is used.</p></div> -<div class="para"><p>In order to determine what remote branches to fetch (and +and if there is not any such variable, the value on <tt>URL: ` line +in `$GIT_DIR/remotes/<origin></tt> file is used.</p></div> +<div class="paragraph"><p>In order to determine what remote branches to fetch (and optionally store in the tracking branches) when the command is run without any refspec parameters on the command line, values of the configuration variable <tt>remote.<origin>.fetch</tt> are -consulted, and if there aren't any, <tt>$GIT_DIR/remotes/<origin></tt> -file is consulted and its <tt>Pull: </tt> lines are used. +consulted, and if there aren’t any, <tt>$GIT_DIR/remotes/<origin></tt> +file is consulted and its `Pull: ` lines are used. In addition to the refspec formats described in the OPTIONS section, you can have a globbing refspec that looks like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>refs/heads/*:refs/remotes/origin/*</tt></pre> </div></div> -<div class="para"><p>A globbing refspec must have a non-empty RHS (i.e. must store +<div class="paragraph"><p>A globbing refspec must have a non-empty RHS (i.e. must store what were fetched in tracking branches), and its LHS and RHS must end with <tt>/*</tt>. The above specifies that all remote branches are tracked using tracking branches in <tt>refs/remotes/origin/</tt> hierarchy under the same name.</p></div> -<div class="para"><p>The rule to determine which remote branch to merge after +<div class="paragraph"><p>The rule to determine which remote branch to merge after fetching is a bit involved, in order not to break backward compatibility.</p></div> -<div class="para"><p>If explicit refspecs were given on the command +<div class="paragraph"><p>If explicit refspecs were given on the command line of <tt>git pull</tt>, they are all merged.</p></div> -<div class="para"><p>When no refspec was given on the command line, then <tt>git pull</tt> +<div class="paragraph"><p>When no refspec was given on the command line, then <tt>git pull</tt> uses the refspec from the configuration or <tt>$GIT_DIR/remotes/<origin></tt>. In such cases, the following rules apply:</p></div> -<div class="olist"><ol> +<div class="olist arabic"><ol class="arabic"> <li> <p> If <tt>branch.<name>.merge</tt> configuration for the current @@ -1280,7 +1373,7 @@ </div> <h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<div class="ilist"><ul> +<div class="ulist"><ul> <li> <p> Update the remote-tracking branches for the repository @@ -1291,7 +1384,7 @@ <div class="content"> <pre><tt>$ git pull, git pull origin</tt></pre> </div></div> -<div class="para"><p>Normally the branch merged in is the HEAD of the remote repository, +<div class="paragraph"><p>Normally the branch merged in is the HEAD of the remote repository, but the choice is determined by the branch.<name>.remote and branch.<name>.merge options; see <a href="git-config.html">git-config(1)</a> for details.</p></div> </li> @@ -1303,7 +1396,7 @@ <div class="content"> <pre><tt>$ git pull origin next</tt></pre> </div></div> -<div class="para"><p>This leaves a copy of <tt>next</tt> temporarily in FETCH_HEAD, but +<div class="paragraph"><p>This leaves a copy of <tt>next</tt> temporarily in FETCH_HEAD, but does not update any remote-tracking branches. Using remote-tracking branches, the same can be done by invoking fetch and merge:</p></div> <div class="listingblock"> @@ -1313,31 +1406,31 @@ </div></div> </li> </ul></div> -<div class="para"><p>If you tried a pull which resulted in a complex conflicts and +<div class="paragraph"><p>If you tried a pull which resulted in a complex conflicts and would want to start over, you can recover with <em>git reset</em>.</p></div> </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="para"><p><a href="git-fetch.html">git-fetch(1)</a>, <a href="git-merge.html">git-merge(1)</a>, <a href="git-config.html">git-config(1)</a></p></div> +<div class="paragraph"><p><a href="git-fetch.html">git-fetch(1)</a>, <a href="git-merge.html">git-merge(1)</a>, <a href="git-config.html">git-config(1)</a></p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> -<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> -and Junio C Hamano <gitster@pobox.com></p></div> +<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>> +and Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>></p></div> </div> <h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<div class="para"><p>Documentation by Jon Loeliger, +<div class="paragraph"><p>Documentation by Jon Loeliger, David Greaves, -Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> +Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-10-27 06:08:21 UTC +Last updated 2010-08-13 02:46:17 UTC </div> </div> </body> 